modules/engines/pixbuf/Makefile.am Build fixes for Cygwin. (#338262)

2006-04-12  Matthias Clasen  <mclasen@redhat.com>

        * contrib/gdk-pixbuf-xlib/Makefile.am:
        * modules/engines/pixbuf/Makefile.am
        * gdk-pixbuf/Makefile.am: Build fixes for Cygwin.  (#338262)

diff --git a/ChangeLog b/ChangeLog
index 14da8891ef16c66e9c408153ab780e0624997002..decaa4ae92f0dc6421ad97703c8914d7d0ea649b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+        * contrib/gdk-pixbuf-xlib/Makefile.am:
+        * modules/engines/pixbuf/Makefile.am
+        * gdk-pixbuf/Makefile.am: Build fixes for Cygwin.  (#338262)
+
        * gdk/x11/gdkselection-x11.c (make_list): Make this work
        for list == NULL.  (Coverity)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 14da8891ef16c66e9c408153ab780e0624997002..decaa4ae92f0dc6421ad97703c8914d7d0ea649b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+        * contrib/gdk-pixbuf-xlib/Makefile.am:
+        * modules/engines/pixbuf/Makefile.am
+        * gdk-pixbuf/Makefile.am: Build fixes for Cygwin.  (#338262)
+
        * gdk/x11/gdkselection-x11.c (make_list): Make this work
        for list == NULL.  (Coverity)
 

diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index dabdb52d01fb8878c2d68d14d001e5ddc27c45b6..611a838addfaa0ecf4a8aec22d46ef1521a4d981 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,3 +1,7 @@
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
 
 INCLUDES = \
@@ -9,6 +13,7 @@ INCLUDES = \
 
 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
        -export-dynamic                                         \
+       $(no_undefined)                                         \
        -version-info $(LT_VERSION_INFO)
 
 libgdk_pixbuf_xlib_2_0_la_LIBADD = \

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index d279928deced9308b518a3eb3fa1e378e2ea2bfc..bcbdcf4477b37bd8cee2e8667ee9a4c8703cab49 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -486,7 +486,7 @@ all-local: gdk-pixbuf.loaders
 endif
 
 if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
+gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
        LOADERS=`echo libpixbufloader-*.la` ; \
        if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \

diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index d2a682f9590720ea33308d88005c64ef9b993788..0b2a3cbd96499715a77a04a175ee9f8347b4ad81 100644 (file)
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -1,4 +1,4 @@
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif